Fixed some validatiting issues