fixes for #877 integration test