Fix a few more oversights.