Tweaks to avoid errors