More tweaking to try to please Travis CI