Fixes for selection overlays