Made a build change for distribution and a small fix to the watchlist