more fixes #5806