Redirect, validation fixes