-Minor fixes-