Fixed a few stuff.