small visibility and access fixes