Tweaks to quotes for proper validation and appearance