Update watch compatibility with 0.6.x