Review #1 fixups

Change-Id: I713ef1b52eca0a1cab00672d3f47d86d231d696d