Tweak loading and startup a little.