Fix crashes reported in 1.1.16