Fix dependencies due should v.4 breaking changes