Several small extra changes