Fix some surface selection rendering edge cases.