Crash issues fix for heroku testing