Rework build to new deps/versions