Missed adding these nit fixes to previous patch

Change-Id: I4f2bb5244ecc74c437564addee58a0de48838b16