Fix long boot time 3/5