N5120: Fix Some Silly Mistakes

Change-Id: Ic2b39f51d36257ba5449d45bfc35b6a198351cb7