Fixed two more bugs in watershed kernel. Should compile now.