Some fixes (see changelog)