Fixes for the world building