Fixed more 3.3 compatibility issues.