Final fixes on compat ?