More fixes

Change-Id: I2d96f29e847f3792b7c75b08d71badc0b58ffa9d