Handful of small tweaks