Correcting errors in some classes