Several updates (see changelog)