fixing more 3.4 issues