More 0.15 changes