Fix issues 8432 and 8433