[*] small stbility fixes