* fix up a couple of issues with world-gen