Initial validation fixes
validation fix
validation fix
validation fix
validation fix
validation fix
validation fix
validation fix
validation fix