Compatibility enhancements, crash fixes