diff --git a/components/fpdebug/fpdbgcontroller.pas b/components/fpdebug/fpdbgcontroller.pas
index 6745e59607..557da623d0 100644
--- a/components/fpdebug/fpdbgcontroller.pas
+++ b/components/fpdebug/fpdbgcontroller.pas
@@ -1,7 +1,6 @@
 unit FPDbgController;
 
 {$mode objfpc}{$H+}
-{$TYPEDADDRESS on}
 {$IFDEF INLINE_OFF}{$INLINE OFF}{$ENDIF}
 
 interface
diff --git a/components/lazdebuggers/lazdebuggerfprspremote/rspremotedebugger.pas b/components/lazdebuggers/lazdebuggerfprspremote/rspremotedebugger.pas
index 35fae94cf9..991f889594 100644
--- a/components/lazdebuggers/lazdebuggerfprspremote/rspremotedebugger.pas
+++ b/components/lazdebuggers/lazdebuggerfprspremote/rspremotedebugger.pas
@@ -255,7 +255,9 @@ begin
 end;
 
 initialization
+  {$IFOPT T-}
   RegisterDebugger(TFpRspRemoteDebugger);
+  {$ENDIF}
 
 end.