More legacy layer updates.