Fix bootstrap/heroku issues