Fix warnings on URLs
Adjust session management