Fix outdated dependencies

Dependency APIs changed - fix resulting issues