Minor fixes+