Fixing some DB issues
Minor DB and XML fixes.