Various Fixes

Change-Id: Id2a52ffa60e95131e06eb9c680e0e1b41c506be4