Some more start-up changes