Merge cosmetic fixes from steve