fixes for class views