Some other changes

Change-Id: Iff48e60399e457600c6b172ae88ecd200f473f12