Tweaks to buildpack