Fixes due to Galera SST bug