More fixes to fabric script