Minor Fixes-1