Tweaks to fix double quotes