Observation baseline fixes

To Jeremy: going home.