Observable type re-entrant fixes