Some little fixes

Change-Id: Icb50d0d2971a86997a59f484bcf25cf5a67f91cb