More minor changes

TBR #3389

@ikeough @pboyer @Steell