More Fixes from 4.4.3 merge