Minor improvements to demo validator