Fixing classes.