Please review rt46649 which fixes both issues.  IMHO merging these
tweaks does not warrant a CHANGES note.