Fix all sorts of brokenness in booting and OSC-bundling