Tweaks here and there