Some fixes and user session