Fixing some quote issues