Fixes after integration tests (with fabric)