patches... again

Change-Id: I5510523cec8896294515e475804e93fa3f941d49