Fixed Travis CI issues