Fixed a few more spots