Fixed issues with no class def found