Some plasticity improvements