these fixes are also independent of this PR