Tweaks to try to clear heroku/git issue