Underscore fixes