4.3 fixes

Change-Id: Iccc7955a206f022e64bdbb95bf9cc70e101e20ae