A few more fixes.  Should be multi-world compatible now.