Fix other classes