Tweaks for consistency