Minor updates
Fix for Heroku