Fix a couple oversights