Move a couple of init directly to main.