fixes for class build