Minor Fixes
Merge remote-tracking branch 'origin/shan' into sonali