Watchboy fix scripts