More 3.5 compatibility changes.