various smaller fixes from integration testing