Cleanup, fix some cases where logging does not log the world.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>