--- EV/typemap	2007/12/20 09:26:40	1.14
+++ EV/typemap	2010/10/24 19:01:01	1.18
@@ -14,6 +14,8 @@
 ev_embed *		T_WATCHER
 ev_stat *		T_WATCHER
 ev_fork *		T_WATCHER
+ev_cleanup *		T_WATCHER
+ev_async *		T_WATCHER
 
 char *			T_PVbyte
 const char *		T_PVbyte
@@ -21,7 +23,7 @@
 INPUT
 
 T_SIGNAL
-	if (($var = sv_signum ($arg)) <= 0)
+	if (($var = s_signum_croak ($arg)) <= 0)
           croak (\"'%s' is not a valid signal number or name\", SvPV_nolen ($arg));
 
 T_PVbyte
@@ -29,7 +31,7 @@
 
 T_LOOP
 	if (!(SvROK ($arg) && SvOBJECT (SvRV ($arg))
-              && (SvSTASH (SvRV ($arg)) == stash_loop)))
+              && (SvSTASH (SvRV ($arg)) == stash_loop || sv_derived_from ($arg, \"EV::Loop\"))))
           croak (\"object is not of type EV::Loop\");
 	$var = ($type)SvIVX (SvRV ($arg));