Fix more weird stuff