More visibility updates.

No idea why this didn't get commited with the other batch :/