Fixed more stuffs