a few bug fixes to get the integration tests running again