A bunch of small tweaks