Small improvements to the validation-tool.