Fix strings and flip partially watched flag