Gbandet/fix replication errors