Tweaks to prevent nil refs