Tweaks to improve installation