Some additional minor changes.