AE: various fixes

see title.