Fix some validation