v1.4 update

Fixes to rewrite validation checkes.