Fixes for AWORMap, still some more testing to do