Small improvements

Change-Id: Id237840e8b66176360a807fefa73f1ba65bc52ca