Some small progress towards fixing heroku example