Bunch of small tweaks