N5110: Fixing Some Silly Mistakes

Change-Id: Ic0ab2f65cbe7599d471007e70d5bf068f2b4be6e