Tweaks to hopefully keep from crashing