Minor fixes on top of previous commit

Change-Id: I97949f95beb0d717359d2dcfc1cd5cadd120c5c1