fix latest breakages