Fix more quoting issues