Minor changes on sessions