rel #3623 small fixes