Vesuvio + some fixes