diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90e2f281..eda1389b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+19.03.2021
+
+- fixed mouse bytes generation if Cutout Plugin to add an extra drill hole at the end
+- fixed an issue in Film Plugin made by copy/paste done recently to make sure that objects selected in Project Menu are populated in the Plugin UI on Film Plugin launch
+- removed a parameter in the serialized parameters for CNCJob object (no longer used)
+
 18.03.2021
 
 - changed some strings; updated the translation strings with the new strings (they need to be translated)
diff --git a/appObjects/FlatCAMCNCJob.py b/appObjects/FlatCAMCNCJob.py
index e3f074c8..eb3d9a2b 100644
--- a/appObjects/FlatCAMCNCJob.py
+++ b/appObjects/FlatCAMCNCJob.py
@@ -175,7 +175,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
         # Always append to it because it carries contents
         # from predecessors.
         self.ser_attrs += [
-            'options', 'kind', 'origin_kind', 'cnc_tools', 'exc_cnc_tools', 'multitool', 'append_snippet',
+            'options', 'kind', 'cnc_tools', 'exc_cnc_tools', 'multitool', 'append_snippet',
             'prepend_snippet', 'gc_header'
         ]
 
diff --git a/appPlugins/ToolCutOut.py b/appPlugins/ToolCutOut.py
index 8f7d4a98..a70db1dc 100644
--- a/appPlugins/ToolCutOut.py
+++ b/appPlugins/ToolCutOut.py
@@ -1038,7 +1038,7 @@ class CutOut(AppTool):
                     holes = []
                     for line in mouse_bites_geo:
                         calc_len = 0
-                        while calc_len < line.length:
+                        while calc_len <= line.length:
                             holes.append(line.interpolate(calc_len))
                             calc_len += mb_dia + mb_spacing
 
@@ -1419,7 +1419,7 @@ class CutOut(AppTool):
                     holes = []
                     for line in mouse_bites_geo:
                         calc_len = 0
-                        while calc_len < line.length:
+                        while calc_len <= line.length:
                             holes.append(line.interpolate(calc_len))
                             calc_len += mb_dia + mb_spacing
 
@@ -1915,7 +1915,7 @@ class CutOut(AppTool):
                         mb_spacing = self.ui.mb_spacing_entry.get_value()
                         for line in self.mb_manual_cuts:
                             calc_len = 0
-                            while calc_len < line.length:
+                            while calc_len <= line.length:
                                 holes.append(line.interpolate(calc_len))
                                 calc_len += mb_dia + mb_spacing
                         self.mb_manual_cuts[:] = []
diff --git a/appPlugins/ToolFilm.py b/appPlugins/ToolFilm.py
index 5d4cb31f..bc0982f3 100644
--- a/appPlugins/ToolFilm.py
+++ b/appPlugins/ToolFilm.py
@@ -193,27 +193,24 @@ class Film(AppTool):
 
         self.ui.png_dpi_spinner.set_value(self.app.defaults["tools_film_png_dpi"])
 
-        self.ui.tf_type_obj_combo.set_value('grb')
-        self.ui.tf_type_box_combo.set_value('grb')
-        # run once to update the obj_type attribute in the FCCombobox so the last object is showed in cb
-        self.on_type_obj_index_changed(val='grb')
-        self.on_type_box_index_changed(val='grb')
-
         obj = self.app.collection.get_active()
         if obj:
             obj_name = obj.options['name']
             if obj.kind == 'gerber':
                 # run once to make sure that the obj_type attribute is updated in the FCComboBox
                 self.ui.tf_type_obj_combo.set_value('grb')
-                self.on_object_type('grb')
                 self.ui.tf_type_box_combo.set_value('grb')
-                self.on_combo_box_type('grb')
+                # run once to update the obj_type attribute in the FCCombobox so the last object is showed in cb
+                self.on_type_obj_index_changed(val='grb')
+                self.on_type_box_index_changed(val='grb')
+
             elif obj.kind == 'geometry':
                 # run once to make sure that the obj_type attribute is updated in the FCComboBox
                 self.ui.tf_type_obj_combo.set_value('geo')
-                self.on_object_type('geo')
                 self.ui.tf_type_box_combo.set_value('geo')
-                self.on_combo_box_type('geo')
+                # run once to update the obj_type attribute in the FCCombobox so the last object is showed in cb
+                self.on_type_obj_index_changed(val='geo')
+                self.on_type_box_index_changed(val='geo')
 
             self.ui.tf_type_obj_combo.set_value(obj_name)
             self.ui.tf_type_box_combo.set_value(obj_name)