Fix guard watch to include lib