Updates due to changes in Sds\Validator. Also a few bug fixes