Fixes for multiple replication degrees