Linux - Fixes issue #36
BSD - Some internal watch flag cleanup