Fixing more IFC 4 issues