Minor updates

Change-Id: I97a358a852a8232f0165f693d9ff345c20b288f2