More GMT fixes