Final "things I overlooked" patches for v2.04.