More fabgis fixes to work against fabgis 1.2