Minor changes to get the build completing & session decorated when applicable
Minor changes to get things building in travis-ci