Minor fixes and improvements
