Merge Fixes

A handful of fixes, particularly one that could cause non-deterministic missing data.