NFC fixes

Change-Id: I79ab84a98650fba5a92c93e34126b01a27756c5c