diff --git a/doc/tomboy-ng.1 b/doc/tomboy-ng.1
index 1d0f7325..f2084604 100644
--- a/doc/tomboy-ng.1
+++ b/doc/tomboy-ng.1
@@ -7,6 +7,7 @@ tomboy-ng \- manage a collection of notes using a simple markup
 [\fB\-g\fR]
 [\fB-\-gnome3\fR]
 [\fB\-\-debug\-sync\fR] 
+[\fB\-\-debug\-index\fR] 
 [\fB\-\-config\-dir\fR=\fIPATH_to_DIR\fR]
 [\fB\-o\fR \fIPATH_to_NOTE\fR] 
 [\fB\-\-open-note\fR=\fIPATH_to_NOTE\fR]
@@ -33,6 +34,10 @@ Run gnome3 mode, needed on Linux releases based on gnome3 3.28 or later but not
 .BR \-\-debug-sync
 Generate a lot of logging information on the console during a sync process. Intended for debugging.
 
+.TP
+.BR \-\-debug-index
+Generate a lot of logging information on the console while indexing the notes repo. Intended for debugging.
+
 .TP
 .BR \-c ", " \-\-config\-dir=\fIPATH_to_DIR\fR
 Create or use an alternative config. That config could, for example, specify an alterative location to store notes and sync against a different file sync repository.
diff --git a/package/package_debian.sh b/package/package_debian.sh
index f2f95df4..0cc68104 100644
--- a/package/package_debian.sh
+++ b/package/package_debian.sh
@@ -32,13 +32,13 @@ LAZ_DIR=/home/dbannon/lazarus/lazarus_1_8_4
 function BuildIt () {
 	cd $SOURCE_DIR
 	echo "Building x86_64 Linux"
-	$LAZ_DIR/lazbuild $BUILDOPTS --cpu="x86_64" --build-mode=Release --os="linux" Tomboy_NG.lpi
+	lazbuild $BUILDOPTS --cpu="x86_64" --build-mode=Release --os="linux" Tomboy_NG.lpi
 	echo "Building i386 Linux"
-	$LAZ_DIR/lazbuild $BUILDOPTS --cpu="i386" --build-mode=ReleaseLin32 --os="linux" Tomboy_NG.lpi
+	lazbuild $BUILDOPTS --cpu="i386" --build-mode=ReleaseLin32 --os="linux" Tomboy_NG.lpi
 	echo "Building x86_64 Windows"
-	$LAZ_DIR/lazbuild $BUILDOPTS --cpu="x86_64" --build-mode=ReleaseWin64 --os="win64" Tomboy_NG.lpi
+	lazbuild $BUILDOPTS --cpu="x86_64" --build-mode=ReleaseWin64 --os="win64" Tomboy_NG.lpi
 	echo "Building i386 Windows"
-	$LAZ_DIR/lazbuild $BUILDOPTS --cpu="i386" --build-mode=ReleaseWin32 --os="win32" Tomboy_NG.lpi
+	lazbuild $BUILDOPTS --cpu="i386" --build-mode=ReleaseWin32 --os="win32" Tomboy_NG.lpi
 	echo "Building x86_64 Linux"
 	# Todo - should check we now have binaries with todays date.
 	echo "------------- FINISHED BUILDING -----------------"
diff --git a/tomboy-ng/editbox.pas b/tomboy-ng/editbox.pas
index 0154d766..5f78d118 100644
--- a/tomboy-ng/editbox.pas
+++ b/tomboy-ng/editbox.pas
@@ -151,6 +151,7 @@
     2018/07/20  Force copy on selection paste to always paste to left of a newline.
     2018/07/23  If a note has no title in content but does have one in xml, caption is
                 left blank and that crashes things that look for * in first char. Fixed
+    2018/07/23  Fixed a bug that crashed when deleting a note in SingleNoteMode.
 }
 
 
@@ -386,7 +387,9 @@ procedure TEditBoxForm.ButtDeleteClick(Sender: TObject);
    if IDYES = Application.MessageBox('Delete this Note', PChar(St),
    									MB_ICONQUESTION + MB_YESNO) then begin
 		TimerSave.Enabled := False;
-   		if NoteFileName <> '' then
+        if SingleNoteMode then
+            DeleteFileUTF8(NoteFileName)
+   		else if NoteFileName <> '' then
 	   		    SearchForm.DeleteNote(NoteFileName);
         Dirty := False;
 		Close;