Fix up some BooBoo's in the last commit

Change-Id: I3bf96f2bb58344d2948102e2702deed2180f1f3d