more fixes for class => klass