Fixing errors (underscore classes)