Fix validate errors