Updates to fix the BB session retrieval.