Merge of formatting fixups from 3.0