Consistency fixes and improvements.