Minor Fixes

Session done upto some extent
Merge remote-tracking branch 'upstream/master'