Fix a few mistakes from last commit