diff --git a/common/openpgp-fpr.c b/common/openpgp-fpr.c
index de28c253b..7b110085f 100644
--- a/common/openpgp-fpr.c
+++ b/common/openpgp-fpr.c
@@ -265,7 +265,7 @@ compute_openpgp_fpr_ecc (int keyversion, unsigned long timestamp,
     {
       if (!kdf || !kdflen || !kdf[0])
         {
-          /* No KDF givem - use the default.  */
+          /* No KDF given - use the default.  */
           kdflen = 4;
           kdf = default_ecdh_params (curvebits);
         }
diff --git a/g10/openfile.c b/g10/openfile.c
index d82858f5a..6f4e889e4 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -64,7 +64,7 @@ overwrite_filep( const char *fname )
   if ( iobuf_is_pipe_filename (fname) )
     return 1; /* Writing to stdout is always okay.  */
 
-  if ( access( fname, F_OK ) )
+  if ( gnupg_access( fname, F_OK ) )
     return 1; /* Does not exist.  */
 
   if ( !compare_filenames (fname, NAME_OF_DEV_NULL) )