Fixed a few mistakes