Fixes supporting Travis CI test builds