coverage fixes, fix coverage build