Fix more compilation problems