Fix quoting issues