Minor refinements and improvements