Couple of small tweaks