Slightly improve startup performance