Minor update to session delegate handlers