Fixed some validation issues

Fixed some validation issues