Tweaks to get setup script running on debian