Compatibility files fixed