Couple of bug fixes to AC33