Fix more stupid problems