Various changes

Change-Id: I3a83b50b455288da13392f03c94acaf912261663