gnm fixes