[BUILD] - Minor performance improvement on boot