More GFM fixes