Final catch-up of changes (I think)