Some fixes for the observable class