Fix compatibility problems.