Fixed a few stuff from the last commit