Tweaks to work with new deploy setup