Fixed minor class issues