Additional fixes for Travis config.