Several small updates