Observables first fixes