Patch from Joe Atzberger to address a number of small issues, including better repo...