Bootstrap 3 computability changes