Fixed various quoting issues.