Fixed some validation methods