Fix Blatant Custom Class Generation Errors