FInal Fixes

Fixes in some files.. after cherry-picking

Change-Id: I2156e9c1d80662cb5ce62280049bc360bc68cb9b