Fixes for multi-database users