fixes for shared/public controls