More Welcome fixes