3.4.7 additional fixes