Fixing issues when migrating 1.8.7.1 to 196 with multiple DBs.