Minor improvements for startup time #671