Watch: more conservative default values
Makefile: fix