changesets: fix loading changesets, really wait for world
bootstrap: fix combined module loading