4 files changed, 19 insertions, 6 deletions
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index 26d0724aaf..213170df7f 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -180,8 +180,8 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
       <name name="beam"/>
       <desc>
         <p>Each of the functions described below accept either the
-          module name, the filename, or a binary containing the BEAM
-          module.</p>
+        filename (as a string) or a binary containing the BEAM
+        module.</p>
       </desc>
     </datatype>
     <datatype>
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 01181b1097..3386cfcbe6 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -53,7 +53,7 @@
 
 %%-------------------------------------------------------------------------
 
--type beam() :: module() | file:filename() | binary().
+-type beam() :: file:filename() | binary().
 -type debug_info() :: {DbgiVersion :: atom(), Backend :: module(), Data :: term()} | 'no_debug_info'.
 
 -type forms()     :: [erl_parse:abstract_form() | erl_parse:form_info()].
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index 41ee3246f5..a8264e5a84 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -124,8 +124,10 @@ start2(Config) when is_list(Config) ->
     {ok, Pid0} = gen_fsm:start(gen_fsm_SUITE, [], []),
     ok = do_func_test(Pid0),
     ok = do_sync_func_test(Pid0),
+    MRef = monitor(process,Pid0),
     shutdown_stopped =
 	gen_fsm:sync_send_all_state_event(Pid0, stop_shutdown),
+    receive {'DOWN',MRef,_,_,shutdown} -> ok end,
     {'EXIT', {noproc,_}} =
 	(catch gen_fsm:sync_send_event(Pid0, hej)),
 
diff --git a/lib/stdlib/test/sys_SUITE.erl b/lib/stdlib/test/sys_SUITE.erl
index 3278eb0eb0..fcc4419569 100644
--- a/lib/stdlib/test/sys_SUITE.erl
+++ b/lib/stdlib/test/sys_SUITE.erl
@@ -219,7 +219,7 @@ spec_proc(Mod) ->
 		       {Mod,system_get_state},{throw,fail}},_}} ->
 		 ok
 	 end,
-    ok = sys:terminate(Mod, normal),
+    ok = sync_terminate(Mod),
     {ok,_} = Mod:start_link(4),
     ok = case catch sys:replace_state(Mod, fun(_) -> {} end) of
 	     {} ->
@@ -228,7 +228,7 @@ spec_proc(Mod) ->
 		       {Mod,system_replace_state},{throw,fail}},_}} ->
 		 ok
 	 end,
-    ok = sys:terminate(Mod, normal),
+    ok = sync_terminate(Mod),
     {ok,_} = Mod:start_link(4),
     StateFun = fun(_) -> error(fail) end,
     ok = case catch sys:replace_state(Mod, StateFun) of
@@ -240,7 +240,18 @@ spec_proc(Mod) ->
 	     {'EXIT',{{callback_failed,StateFun,{error,fail}},_}} ->
 		 ok
 	 end,
-    ok = sys:terminate(Mod, normal).
+    ok = sync_terminate(Mod).
+
+sync_terminate(Mod) ->
+    P = whereis(Mod),
+    MRef = erlang:monitor(process,P),
+    ok = sys:terminate(Mod, normal),
+    receive
+        {'DOWN',MRef,_,_,normal} ->
+            ok
+    end,
+    undefined = whereis(Mod),
+    ok.
 
 %%%%%%%%%%%%%%%%%%%%
 %% Dummy server