Some fabfile interim fixes