Fixes to observable scope