Fixed some of the getClazz implementations