Merge "Tidying of the jweak fix."