fixes from and for integration-tests