* Minor fixes and improvements
