[FIX] Bootstrap edits