visibility and data fixes