Merge "Misc small changes in Session.java."