Fix for Travis CI build failure(s)