Make some minor tweaks