Minor fixes and improvements
Minor fixes and improvements