Fixes to data observers