Heroku updates + other small stuff