Fixed some more stuffs.