Misc fixes
Fixed problem with XML DB driver