Comment and visibility fixes