Odd tweaks and fixes.