Fixed mixed quote issues