Tweaks to save code space