A few more tweaks to finish things up