Fix minor watch issues

Signed-off-by: Valérian Saliou <valerian@valeriansaliou.name>