Some fix for heroku works