3 files changed, 4 insertions, 7 deletions
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c
index cb975d64b0..f308039baf 100644
--- a/erts/emulator/beam/erl_async.c
+++ b/erts/emulator/beam/erl_async.c
@@ -394,6 +394,8 @@ static ERTS_INLINE void call_async_ready(ErtsAsync *a)
 	}
 	erts_port_release(p);
     }
+    if (a->pdl)
+	driver_pdl_dec_refc(a->pdl);
     if (a->hndl)
 	erts_ddll_dereference_driver(a->hndl);
 }
@@ -403,9 +405,6 @@ static ERTS_INLINE void async_reply(ErtsAsync *a, ErtsThrQPrepEnQ_t *prep_enq)
 #if ERTS_USE_ASYNC_READY_Q
     ErtsAsyncReadyQ *arq;
 
-    if (a->pdl)
-	driver_pdl_dec_refc(a->pdl);
-
 #if ERTS_ASYNC_PRINT_JOB
     erts_fprintf(stderr, "=>> %ld\n", a->async_id);
 #endif
@@ -425,8 +424,6 @@ static ERTS_INLINE void async_reply(ErtsAsync *a, ErtsThrQPrepEnQ_t *prep_enq)
 #else /* ERTS_USE_ASYNC_READY_Q */
 
 	call_async_ready(a);
-	if (a->pdl)
-	    driver_pdl_dec_refc(a->pdl);
 	erts_free(ERTS_ALC_T_ASYNC, (void *) a);
 
 #endif /* ERTS_USE_ASYNC_READY_Q */
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index f90daadadc..a44401d7b1 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -351,7 +351,7 @@ static int clock_resolution;
 /*
 ** The clock resolution should really be the resolution of the 
 ** time function in use, which on most platforms 
-** is 1. On VxWorks the resolution shold be 
+** is 1. On VxWorks the resolution should be
 ** the number of ticks per second (or 1, which would work nicely to).
 **
 ** Setting lower resolutions is mostly interesting when timers are used
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index 347247ee7b..f24098025e 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -2597,7 +2597,7 @@ file_output(ErlDrvData e, char* buf, ErlDrvSizeT count)
 #ifdef USE_VM_PROBES
 	    dt_s1 = d->b;
 	    dt_s2 = d->b + namelen;
-	    dt_utag = buf + namelen + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
+	    dt_utag = buf + namelen + FILENAME_BYTELEN(new_name) + FILENAME_CHARSIZE;
 #endif
 	    d->flags = desc->flags;
 	    d->fd = fd;