Minor fixes in world