Just some minor tweaks to get things moving