Several small changes.