diff --git a/.gitignore b/.gitignore
index 7c39add..bf4e99f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,15 +15,16 @@ obj
 test
 doc
 cortex-gnat-rts*
-
-stm32f429xx_h.ads
+.DS_Store
 
 auto.cgpr
 gnatinspect.db
+gpr_query.*
 
 local/
 
-demos-arduino-due/debounce
+demos-arduino-due/debounce_hardware
+demos-arduino-due/debounce_software
 demos-arduino-due/first
 
 test-arduino-due/
diff --git a/test-common/dispatching.adb b/test-common/dispatching.adb
index 489a1c2..e49687d 100644
--- a/test-common/dispatching.adb
+++ b/test-common/dispatching.adb
@@ -1,4 +1,4 @@
---  Copyright (C) 2016, 2017 Free Software Foundation, Inc.
+--  Copyright (C) 2016, 2017, 2020 Free Software Foundation, Inc.
 
 --  This file is part of the Cortex GNAT RTS package.
 --
@@ -29,7 +29,8 @@ package body Dispatching is
    end T;
 
    task body T is
-      D : constant access Base'Class := new Derived;
+      type Base_P is access Base'Class;
+      D : constant Base_P := new Derived;
    begin
       loop
          declare