Fixed issue with watch + minor updates