Fixes

Change-Id: Icfb949552fb9835eb815eced0e5014bdb75e1e1f