AM-6 and AM-3 bug fixes - not finished yet