Small updates to session tracking