Fixed some things related to validation