Correcting some errors in model classes