Bunch of small tweaks.