Fix some nits which came up during review