Fix for base errors on heroku