Tweaks to the dist build