Compatibility improvements.