Fixing TravisCI issues