Fix long boot time 5/5