UMD and Validator tweaks