Fix #208 and #209
Change the session lifetime duration