Fixed some more stuffs