More tweaks

Change-Id: I3949901a0952d055a2bfc7cce44f042b9fe6f85f