More GFM changes