Minor fixes that I missed in RC4.