And refix build warnings about DatabaseName. Old fix was warning-fixing by build-breaking.