More plasticity tweaks