Tweaks to get things running