Tweak build for dependencies