Rolling fixes for world-users TWO