Bootstrap Compatibility Updates