Update validator (and usage), fixes #658