WIP: minor changes

Change-Id: I1a6e274f012fc9a46694af0858653d51d614e703