small changes to avoid startup timing issues