Different fixes

Change-Id: I7c67f87362d0552da11e51dace2558d9d65cbdd9