Fix 'watch' task
Expose 'wrap' function