Some fixes and sticky session