Some small changes after the fact