Tweaks to make this thing run