fix for boluses that haven't completed when an upload occurs and some tweaks required for jellyfish