Fixed some additional quoting issues.