validation fixes and post-peer test fixes