Visibility fixes