Tweak dependencies to satisfy warnings