modifications to fix bootstrap from disk