Fixed classes bug fixes.