Fix some validator issues (no generic library)
Fix some validator issues (no generic library)