Just a couple tweaks