bug fixes for amwg