minor tweaks, final <=5.2 release