* Minor fixes and improvements