Just a few more tweaks