Fix some stuff

Change-Id: I356c9675f2bd59821624774aeb189949bc354d94