Fixed minor issues on class autoloader