Format ghm fixes