diff --git a/compiler/wasm/aasmcpu.pas b/compiler/wasm/aasmcpu.pas
index a5512d35a3..4c25d6646a 100644
--- a/compiler/wasm/aasmcpu.pas
+++ b/compiler/wasm/aasmcpu.pas
@@ -258,7 +258,7 @@ implementation
       begin
       end;
 
-begin
+initialization
   cai_cpu:=taicpu;
   cai_align:=tai_align;
   casmdata:=TAsmData;
diff --git a/compiler/wasm/agbinaryen.pas b/compiler/wasm/agbinaryen.pas
index 506333799c..a8c06c2cf1 100644
--- a/compiler/wasm/agbinaryen.pas
+++ b/compiler/wasm/agbinaryen.pas
@@ -607,6 +607,6 @@ implementation
        );
 
 
-begin
+initialization
   RegisterAssembler(as_wasm_binaryen_info,TBinaryenAssembler);
 end.
diff --git a/compiler/wasm/cpubase.pas b/compiler/wasm/cpubase.pas
index fab5e9e674..5a042b590f 100644
--- a/compiler/wasm/cpubase.pas
+++ b/compiler/wasm/cpubase.pas
@@ -214,7 +214,7 @@ uses
       NR_FRAME_POINTER_REG = NR_STACK_POINTER_REG;
       RS_FRAME_POINTER_REG = RS_STACK_POINTER_REG;
 
-      { Java results are returned on the evaluation stack, not via a register }
+      { WebAssembly results are returned on the evaluation stack, not via a register }
 
       { Results are returned in this register (32-bit values) }
       NR_FUNCTION_RETURN_REG = NR_NO;
diff --git a/compiler/wasm/cpupara.pas b/compiler/wasm/cpupara.pas
index d411be6628..3798a023a3 100644
--- a/compiler/wasm/cpupara.pas
+++ b/compiler/wasm/cpupara.pas
@@ -1,5 +1,5 @@
 {
-    Copyright (c) 1998-2010 by Florian Klaempfl, Jonas Maebe
+    Copyright (c) 2019 by Dmtiry Boyarintsev
 
     Calling conventions for the WebAssembly
 
@@ -324,6 +324,6 @@ implementation
       end;
 
 
-begin
-   ParaManager:=tcpuparamanager.create;
+initialization
+  ParaManager:=tcpuparamanager.create;
 end.
diff --git a/compiler/wasm/cpupi.pas b/compiler/wasm/cpupi.pas
index 57f5092a89..36337d3ef8 100644
--- a/compiler/wasm/cpupi.pas
+++ b/compiler/wasm/cpupi.pas
@@ -60,6 +60,6 @@ implementation
       end;
 
 
-begin
+initialization
   cprocinfo:=tcpuprocinfo;
 end.
diff --git a/compiler/wasm/symcpu.pas b/compiler/wasm/symcpu.pas
index 7fa1ea036e..3681f70633 100644
--- a/compiler/wasm/symcpu.pas
+++ b/compiler/wasm/symcpu.pas
@@ -912,7 +912,7 @@ implementation
         result:=inherited;
     end;
 
-begin
+initialization
   { used tdef classes }
   cfiledef:=tcpufiledef;
   cvariantdef:=tcpuvariantdef;