Boot script improvements