fixes for master #2089