Fixed quote issues