Just fixes for class