Backported fixes from HEAD