diff --git a/common/direct/hw-pci-dev.adb b/common/direct/hw-pci-dev.adb
index 3d76521..8a1a56b 100644
--- a/common/direct/hw-pci-dev.adb
+++ b/common/direct/hw-pci-dev.adb
@@ -78,8 +78,8 @@
 
    procedure Resource_Size (Length : out Natural; Res : Resource)
    is
-      use Type HW.Word16;
-      use Type HW.Word32;
+      use type HW.Word16;
+      use type HW.Word32;
 
       Cmd : Word16;
       Base, Backup : Word32;
diff --git a/debug/hw-debug.adb b/debug/hw-debug.adb
index 60968e1..2f1fed9 100644
--- a/debug/hw-debug.adb
+++ b/debug/hw-debug.adb
@@ -251,7 +251,7 @@
             Debug_Sink.Put_Char (' ');
             for J in Natural range 8 .. Natural'Min (15, Left)
             loop
-               Put_Word (Word64(Buf (Line_Start + J)), 2, False);
+               Put_Word (Word64 (Buf (Line_Start + J)), 2, False);
                Debug_Sink.Put_Char (' ');
             end loop;
             New_Line;
@@ -272,7 +272,7 @@
 
    ----------------------------------------------------------------------------
 
-   Procedure Register_Write_Wait
+   procedure Register_Write_Wait
    is
    begin
       if Register_Write_Delay_Nanoseconds > 0 then
diff --git a/debug/hw-debug.ads b/debug/hw-debug.ads
index adf61fb..e3d6b2b 100644
--- a/debug/hw-debug.ads
+++ b/debug/hw-debug.ads
@@ -37,7 +37,7 @@
    procedure Put_Buffer (Name : String; Buf : in Buffer; Len : in Buffer_Range);
 
    procedure Set_Register_Write_Delay (Value : Word64);
-   Procedure Register_Write_Wait;
+   procedure Register_Write_Wait;
 end HW.Debug;
 
 --  vim: set ts=8 sts=3 sw=3 et: