More fixes and improvements.