Compatibility improvements