aco: a couple simple fixes

Rhys Perry requested to merge pendingchaos/mesa:aco_misc_fixes2 into master Jan 23, 2020