Fixed a few more stuff.