Fixed a few mistakes from last commit