Misc tweaks; single to double quotes