Small fixups

Change-Id: I423f1cff99551fa8bb29356a41d3a11e535962f0
Merge "Small fixups"