Minor fixes-