Fixed some underscore methods