More 0.11 changes.