fixes according to PMN format