1.4 fixes part 2