several fixes have gone upstream!