Reviewed-by: Emilia Kasper Many of these were already fixed, this catches the last few that were missed.
