Fixed observable issues