More startup performance optimisations.