Fixes

Change-Id: I8dd6af874fd9e5683dc5c826511cabe46bb81909