small fixes to resolve problems with loading demodatabase