Fixed 2.9 compatibility issues.