Some init changes, maybe this time boots...

Change-Id: Iabac4dacb29845c540383fd70cb6e7157dd396e0