Small fixes and improvements.