Re: some changes for (slightly) faster boot