diff --git a/lua/gitlab/actions/comment.lua b/lua/gitlab/actions/comment.lua
index cee4094..2836693 100644
--- a/lua/gitlab/actions/comment.lua
+++ b/lua/gitlab/actions/comment.lua
@@ -62,7 +62,7 @@ M.create_comment_suggestion = function()
   local current_line = vim.api.nvim_win_get_cursor(0)[1]
   local range = end_line - start_line
   local backticks = "```"
-  local selected_lines = reviewer.get_lines(start_line, end_line)
+  local selected_lines = u.get_lines(start_line, end_line)
 
   for line in ipairs(selected_lines) do
     if string.match(line, "^```$") then
diff --git a/lua/gitlab/indicators/diagnostics.lua b/lua/gitlab/indicators/diagnostics.lua
index 13eeba1..7548a9b 100644
--- a/lua/gitlab/indicators/diagnostics.lua
+++ b/lua/gitlab/indicators/diagnostics.lua
@@ -49,7 +49,7 @@ end
 local create_single_line_diagnostic = function(discussion)
   local first_note = discussion.notes[1]
   return create_diagnostic({
-    lnum = first_note.position.new_line - 1,
+    lnum = (first_note.position.new_line or first_note.position.old_line) - 1,
   }, discussion)
 end