Bunches of small tweaks.