Fix more issues...