Last couple tweaks