Touched up map validation.