couple minor consistency tweaks