Some init fixes