Fixes for GFM