fixes based on integration tests with devel