A few more shardkv timing changes