Fixed Travis CI build issues