Fix more compile warnings/errors