some fixes for classes