More 3.1 updates.