Attempt to make post startup nicer #2