Super minor tweaks