moar fixing stuff from heroku-git