Minor tunes and fixes.