Fixing things up for 4.3

Change-Id: If68f016d2fab67cbe41d93ddb1567e57da0b6d4d