Fixed some validation