Added more fixes for observable coincidence