Couple little tweaks