Try to fix heroku build issues