Massively improve surface mode positioning.