Misc. OCD fixes
Conflict resolutions on pull.