Fix scope/visibility.