Tweaks that were sitting in a local copy for two years

:)