HSF Fix Building Maintenance