Heroku: Add rest of dependencies, fix build issues