Improvements to validation scripts