Kazu reimp 6

These patches make validate work.