Quotes and validation tweaks