Fixed some validation errors