Modernize demo db a little.
This is mainly for nicer testing - we should really create a new demo database...
Changes: