Fixes for travis-ci.org.