Various changes

Change-Id: I78a039a73b4a6e43fa513df550cd17de5c2b92af