[*] small stability fixes