Minor fixes ...