Some minor tweaks for consistency