Minor improvements

Change-Id: Ieca40af54fba7e4af39033876b53171931b19225