Get rid of some more validation exceptions.