Minor cleanup, visibility fixes