Fix more stuffs