More fixes for problematic dependencies on Heroku