Updates for building on Travis CI
CP