Try to fix heroku
Try to fix heroku part II
Fix link errors