Fix more issues