Update some things

Change-Id: Iacdfee3dfa116961130b3b9281b6215d8a9549a3