Visibility and efficiency tweaks