Missed the last changes from July

I'm not sure all what is in here, but we can do a quick review and get it added.