Minor tweaking to accomodate Heroku