Some fixes to A1e