Fixes

Change-Id: I8f8f109673613ae4c8a86f6b235c487203c8609c