Fixes for travis-ci configuration.