mode change
fixes for POMS with no namespace