Fixed my fixes

Change-Id: I9d6ca26de88f667bc89a243084739e1b2d4bfca5