aec3512 Minor tweaks.