A few things

Change-Id: I54663080c1b034848405364ed6ccaa529ce4c594