And keep fixing default visibility

Change-Id: I63d83e5bd4d6e1cb06bd82f03616ac17709bc3db