Fixed even more 3.3 compat issues.