Fix more const qualifier compile warnings