Fixing watch issues