Fix some underscore placement issues