Some visibility fixes