Couple More Tweaks