Minor behavioral changes regarding startup