US5995: More AT fixes