Various minor manual nits