Fixes on experimental support for multiple databases