Fix more quote issues