Fix compatability issues.