Minor updates

Change-Id: I4667e38459eec46e55dc5c689fd175ea3219d985