Attempt to fix issues with 3.2 compatability.