Group fixes for AC

Fixes several bugs for AC so testing can continue on group badges.