Fixes after integration tests (with fabric), part 2