2 files changed, 9 insertions, 8 deletions
diff --git a/src/win/graph/direct/text_layout.cpp b/src/win/graph/direct/text_layout.cpp
index 4a742694..7b8d2ab0 100644
--- a/src/win/graph/direct/text_layout.cpp
+++ b/src/win/graph/direct/text_layout.cpp
@@ -105,7 +105,7 @@ std::vector<Rect> DWriteTextLayout::TextRangeRect(
   return result;
 }
 
-Point DWriteTextLayout::TextSingleRect(gsl::index position, bool trailing) {
+Point DWriteTextLayout::TextSinglePoint(gsl::index position, bool trailing) {
   const auto index =
       IndexUtf8ToUtf16(text_, static_cast<int>(position), w_text_);
 
diff --git a/src/win/native/ui_application.cpp b/src/win/native/ui_application.cpp
index 9aa3ebcd..599ecadc 100644
--- a/src/win/native/ui_application.cpp
+++ b/src/win/native/ui_application.cpp
@@ -73,19 +73,20 @@ void WinUiApplication::InvokeLater(std::function<void()> action) {
     throw Win32Error(::GetLastError(), "InvokeLater failed to post message.");
 }
 
-unsigned long WinUiApplication::SetTimeout(
-    std::chrono::milliseconds milliseconds, std::function<void()> action) {
-  return static_cast<unsigned long>(timer_manager_->CreateTimer(
+long long WinUiApplication::SetTimeout(std::chrono::milliseconds milliseconds,
+                                       std::function<void()> action) {
+  return gsl::narrow<long long>(timer_manager_->CreateTimer(
       static_cast<UINT>(milliseconds.count()), false, std::move(action)));
 }
 
-unsigned long WinUiApplication::SetInterval(
-    std::chrono::milliseconds milliseconds, std::function<void()> action) {
-  return static_cast<unsigned long>(timer_manager_->CreateTimer(
+long long WinUiApplication::SetInterval(std::chrono::milliseconds milliseconds,
+                                        std::function<void()> action) {
+  return gsl::narrow<long long>(timer_manager_->CreateTimer(
       static_cast<UINT>(milliseconds.count()), true, std::move(action)));
 }
 
-void WinUiApplication::CancelTimer(unsigned long id) {
+void WinUiApplication::CancelTimer(long long id) {
+  if (id < 0) return;
   timer_manager_->KillTimer(static_cast<UINT_PTR>(id));
 }