Fix validate issues