Fixed a few stuff