Fix Travis and other bugs in previous commit