Just some minor tweaks