Fixed support for non-running init