ENH: Fixes for wrappers, adding initial watchdog