Fix changes with latest package versions