Minor fixes4