World generation fixes