Tweaks to fix running on Turner's comp