Lucas

validation fixes