Some small changes to session lifetime etc