Tweak
Quieten DataNucleus again
Fix (hopefully!) the URI generation system.