Updated files to fix heroku errors