Merge "Minor fixes and improvements for crate health code." into main