! couple of small fixes from 2.4 branch patch