Fix regression #1727 + small fixes for #1717