Fix things at the risk of breaking others

Change-Id: I7ba078c03811c62ef62b7e6c9b806ab533582664