Misc cleanup
Fixed orphans being reported for shard keys on cluster boundaries