Fix minor consistency issues