Tweaks for the future