Another bit of work

Change-Id: Ib1bfd3a7cf3a4abb5860fe14e8a3beefda7de48b