Fix mistakes in the validation mash up