validators fixes