Tweak build for current dependencies