Fixed quoting issues