Visibility fixes

Visibility fixes