Minor fixes in