Updates to fix NAA and AWM issues