5.7 tweaks as requested by JPD.