Fixes Fixes everywhere

Change-Id: I1ce2f76395bd84741d741fe5a01f7b25e6e14625