Fixes

Change-Id: I25fd52e2c277eeff214201dbe084c5c748dcfe62