Final changes compatibilities