Backwards compatibility fixes

See commit comments.
Adding bootstrapMode arg is genius! @lennyvarghese ...