fix validate issues