Several small adjustments