Final few tidyups

Change-Id: I4bfe4e0ce5d2ce36e41f8e207e34d757ca15720a