back-in jenesens' already merged fixes