fixes from 4.4 branch