Fix a couple more things, plus silly typo