more 1.4.0 fixes