Personal tweaks and fixes.