Fixes for class