More updates

Change-Id: I861eb7723122d002367038bfc98b655f374c99c4