Dev snapshot - some validation tweaks.