Rest of require; minor bootstrap change