Fix base_extra_spec
Don't call inner_object in specs
Fix change tracking on datastreams