JWR bits and pieces

Change-Id: I233f574839b523e95e1509c2cab68a829bf76410