Visibility Fixes and API helpers