Fixed some validation issues