Slight compatibility modifications