Replication page consistency, fixes