Another bunch of work attempting to further bulletproof startup