Fix long boot time 2/5