diff --git a/fluid/autodoc.cxx b/fluid/autodoc.cxx
index 0f2ea8e4ad..35e1a73bdd 100644
--- a/fluid/autodoc.cxx
+++ b/fluid/autodoc.cxx
@@ -104,6 +104,7 @@ static int convert_RGB_to_RGBA(Fl_RGB_Image *&img) {
   delete img;
   // Create the new image
   img = new Fl_RGB_Image(data, img_w, img_h, 4);
+  delete[] data;
   return 0;
 }
 
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 44814574e0..a986c4c515 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -2302,6 +2302,8 @@ int main(int argc,char **argv) {
   // check if the user wants FLUID to generate image for the user documentation
   if (!g_autodoc_path.empty()) {
     run_autodoc(g_autodoc_path);
+    set_modflag(0, 0);
+    exit_cb(0,0);
     return 0;
   }
 #endif