fix some validator issues (#241)