fixed all remaining compilation issues in fabric bundle