Fixes for v1.4.4

let's fix master