Fix a couple of oversights.