[IT] Some fixes