diff --git a/MAINTAINERS b/MAINTAINERS
index 5af80329deb..3dd33522734 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -53,7 +53,7 @@ include/
 	See also binutils/, gdb/, sid/, gcc/, libiberty/ etc.
 
 intl/; config.rhost; libiberty/; libiberty's part of include/;
-compile; depcomp; install-sh; missing; ylwrap; config/
+compile; depcomp; install-sh; missing; ylwrap; config/; libbacktrace
 	gcc: http://gcc.gnu.org
 	Changes need to be done in tandem with the official GCC
 	sources or submitted to the master file maintainer and brought
diff --git a/bfd/vms-lib.c b/bfd/vms-lib.c
index 592a57fbe68..c51476ac441 100644
--- a/bfd/vms-lib.c
+++ b/bfd/vms-lib.c
@@ -1270,12 +1270,12 @@ vms_lib_bstat (struct bfd *abfd ATTRIBUTE_UNUSED,
 static void *
 vms_lib_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
 	       void *addr ATTRIBUTE_UNUSED,
-	       bfd_size_type len ATTRIBUTE_UNUSED,
+	       size_t len ATTRIBUTE_UNUSED,
 	       int prot ATTRIBUTE_UNUSED,
 	       int flags ATTRIBUTE_UNUSED,
 	       file_ptr offset ATTRIBUTE_UNUSED,
 	       void **map_addr ATTRIBUTE_UNUSED,
-	       bfd_size_type *map_len ATTRIBUTE_UNUSED)
+	       size_t *map_len ATTRIBUTE_UNUSED)
 {
   return MAP_FAILED;
 }