Fixing more errors for Heroku deploy