Several small changes