Fixes for gfc