AM-6 and AM-3 more fixes