Improve BigCouch compatibility