- Minor fixes and improvements