JWR bits and pieces

Change-Id: I8bb6d2bc6cbfc078405fb1be151836aa0139c4da