BUG-5280: fix problems identified by integration tests