diff --git a/autoload/vimspector/internal/balloon.vim b/autoload/vimspector/internal/balloon.vim
index 384b18a..a51d092 100644
--- a/autoload/vimspector/internal/balloon.vim
+++ b/autoload/vimspector/internal/balloon.vim
@@ -279,6 +279,7 @@ function! s:CreateNeovimTooltip( body ) abort
   call nvim_buf_set_option( buf_id, 'modifiable', v:false )
   let s:popup_win_id = nvim_open_win( buf_id, v:false, opts )
 
+  " Apparently none of these work, when 'style' is 'minimal'
   call nvim_win_set_option( s:popup_win_id, 'wrap', v:false )
   call nvim_win_set_option( s:popup_win_id, 'cursorline', v:true )
   call nvim_win_set_option( s:popup_win_id, 'signcolumn', 'no' )
diff --git a/python3/vimspector/utils.py b/python3/vimspector/utils.py
index 4022315..10da7e1 100644
--- a/python3/vimspector/utils.py
+++ b/python3/vimspector/utils.py
@@ -707,7 +707,7 @@ def SetSyntax( current_syntax, syntax, *args ):
     syntax = ''
 
   if current_syntax == syntax:
-    return
+    return syntax
 
   # We use set syn= because just setting vim.Buffer.options[ 'syntax' ]
   # doesn't actually trigger the Syntax autocommand, and i'm not sure that
diff --git a/python3/vimspector/variables.py b/python3/vimspector/variables.py
index 74626ac..9cd0b3e 100644
--- a/python3/vimspector/variables.py
+++ b/python3/vimspector/variables.py
@@ -301,8 +301,7 @@ class VariablesView( object ):
     with utils.RestoreCursorPosition():
       with utils.ModifiableScratchBuffer( view.buf ):
         utils.ClearBuffer( view.buf )
-        # FIXME: This probably doesn't work reliably
-        view.syntax = utils.SetSyntax( None,
+        view.syntax = utils.SetSyntax( view.syntax,
                                        self._current_syntax,
                                        view.buf )
 
diff --git a/support/custom_ui_vimrc b/support/custom_ui_vimrc
index 51a7304..b1ffda1 100644
--- a/support/custom_ui_vimrc
+++ b/support/custom_ui_vimrc
@@ -38,6 +38,10 @@ function! s:CustomiseUI()
 endfunction
 
 function s:SetUpTerminal()
+  if !has_key( g:vimspector_session_windows, 'terminal' )
+    " There's a neovim bug which means that this doesn't work in neovim
+    return
+  endif
   let terminal_win = g:vimspector_session_windows.terminal
 
   " Make the terminal window at most 80 columns wide, ensuring there is enough