diff --git a/components/customform/custforms.pp b/components/customform/custforms.pp
index c147002d20..67f3b87029 100644
--- a/components/customform/custforms.pp
+++ b/components/customform/custforms.pp
@@ -97,7 +97,6 @@ begin
   Inherited Create;
   FFormDescr:=ADescr;
   ResourceClass:=FFormDescr.FFormClass;
-  FormEditingHook.RegisterDesignerBaseClass(FFormDescr.FFormClass);
   Name:=FFormDescr.Caption;
   RequiredPackages:=ADescr.LazPackage;
   //Writeln('TCustomFormFileDescriptor.Create RequiredPackages=',RequiredPackages);
diff --git a/components/lazreport/source/barcode.pas b/components/lazreport/source/barcode.pas
index eee4e08a34..78a7bea3f9 100644
--- a/components/lazreport/source/barcode.pas
+++ b/components/lazreport/source/barcode.pas
@@ -296,8 +296,8 @@ calculate the width and the linetype of a sigle bar
 ------------------------------------------------------------------
         '0'   white           100%                full
         '1'   white           100%*Ratio          full
-        '2'   white           150%                full
-        '3'   white           200%Ratio              full
+        '2'   white           150%*Ratio          full
+        '3'   white           200%*Ratio          full
         '5'   black           100%                full
         '6'   black           100%*Ratio          full
         '7'   black           150%*Ratio          full
@@ -1463,7 +1463,6 @@ begin
     for i := 1 to Length(Data) do  // examine the pattern string
     begin
       OneBarProps(Data[i], w, lt);
-      Writeln('BC : ',w,' : ',lt,'  (',Data[i],')');
 
       {
       case data[i] of
diff --git a/components/printers/samples/dialogs/frmselprinter.lfm b/components/printers/samples/dialogs/frmselprinter.lfm
index 10a8fa1b01..a473380eb0 100644
--- a/components/printers/samples/dialogs/frmselprinter.lfm
+++ b/components/printers/samples/dialogs/frmselprinter.lfm
@@ -1,7 +1,7 @@
 object Form1: TForm1
   Left = 106
   Height = 787
-  Top = 142
+  Top = 121
   Width = 489
   ActiveControl = Button7
   Caption = 'Form1'
@@ -59,7 +59,7 @@ object Form1: TForm1
         MaxSize = 350
         ReadOnly = True
         Title.Caption = 'Value'
-        Width = 347
+        Width = 345
       end>
     DefaultColWidth = 120
     FixedCols = 0
@@ -71,7 +71,7 @@ object Form1: TForm1
     OnSelectCell = SGridSelectCell
     ColWidths = (
       120
-      347
+      345
     )
   end
   object Button3: TButton
diff --git a/components/sqldb/sqldblaz.lpk b/components/sqldb/sqldblaz.lpk
index 9f462fd245..83e011e754 100644
--- a/components/sqldb/sqldblaz.lpk
+++ b/components/sqldb/sqldblaz.lpk
@@ -24,7 +24,7 @@
 
 With the exception of the unit registersqldb, which is GPL-2. This unit contains code for the IDE and is usually not used by programs."/>
     <Version Major="1" Release="2"/>
-    <Files Count="4">
+    <Files Count="3">
       <Item1>
         <Filename Value="registersqldb.pas"/>
         <HasRegisterProc Value="True"/>
@@ -39,10 +39,6 @@ With the exception of the unit registersqldb, which is GPL-2. This unit contains
         <Filename Value="sqlstringspropertyeditordlg.pas"/>
         <UnitName Value="SQLStringsPropertyEditorDlg"/>
       </Item3>
-      <Item4>
-        <Filename Value="frmtypesafeaccess.pp"/>
-        <UnitName Value="frmtypesafeaccess"/>
-      </Item4>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/sqldb/sqldblaz.pas b/components/sqldb/sqldblaz.pas
index a26bdf6ac7..7ed720c96d 100644
--- a/components/sqldb/sqldblaz.pas
+++ b/components/sqldb/sqldblaz.pas
@@ -8,8 +8,7 @@ unit SQLDBLaz;
 interface
 
 uses
-  registersqldb, SQLStringsPropertyEditorDlg, frmtypesafeaccess, 
-  LazarusPackageIntf;
+  registersqldb, SQLStringsPropertyEditorDlg, LazarusPackageIntf;
 
 implementation
 
diff --git a/packager/pkgregisterbase.pas b/packager/pkgregisterbase.pas
index d9817192aa..1aaab23183 100644
--- a/packager/pkgregisterbase.pas
+++ b/packager/pkgregisterbase.pas
@@ -41,7 +41,7 @@ uses
 {$ifdef mswindows}
   ServiceManager,
 {$endif}
-  Classes, SysUtils, Process, DB, BufDataset, csvdataset, fpjsondataset, SimpleIPC, XMLConf, EventLog,
+  Classes, SysUtils, Process, DB, BufDataset, csvdataset, SimpleIPC, XMLConf, EventLog,
   UTF8Process;
 
 procedure RegisterFCLBaseComponents;
@@ -51,7 +51,7 @@ implementation
 
 procedure RegisterDB;
 begin
-  RegisterComponents('Data Access',[TDatasource,TBufDataset, TCSVDataset, TExtJSJSONDataSet]); // this bites dbflaz
+  RegisterComponents('Data Access',[TDatasource,TBufDataset, TCSVDataset]); // this bites dbflaz
 end;
 
 procedure RegisterSimpleIPC;
diff --git a/tools/jsonviewer/jsonviewer.lpi b/tools/jsonviewer/jsonviewer.lpi
index 7c566c32c3..cfa9b97fc8 100644
--- a/tools/jsonviewer/jsonviewer.lpi
+++ b/tools/jsonviewer/jsonviewer.lpi
@@ -113,7 +113,6 @@
         <Filename Value="frmaddtofavourite.pp"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="SaveRequestDataForm"/>
-        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit10>
     </Units>