init: a few more tweaks from LegacyXperia/mikeNG

Change-Id: I79f0d35ef6d26329b6719fd7f97d83397e6045d4