fix a couple things

Change-Id: I35bf8901675c53004482a64bf9299dd72eb1adb4
Merge "fix a couple things"