Couple of useful tweaks.