Fix behavior for USE catalog/schema