Fix #1714, Fix #1711, Fix #1710