A few updates

Change-Id: Ibd5ca7f45ac1f0fa3c63b2fbb99592d5ce9a8baf