Fixes for different replication degrees