Validation issues patched