AMGA-5 Bug fixes and field limit fixes