Making v1.4.0 fixes