Couple of additional tweaks