Fixes 1.8.7 Issues
Also fixes a travis issue.