Compatibility shims