fixes for class