Fixed some validation stuff