AT fixes