minor consistency improvements