Final changes for NC to boot properly