Fixes

Change-Id: I3de4f86761ea01f89b1c404c28a162ce73d40af5