Fixes to session.h/cpp