Fixed deletion of watchpoints