Fix bug when loading module
Fix 2 bugs when loading bootstrap files