Minor additions

Change-Id: I0f7be365502d0ceb5636a1e5630122f2bd63b909