Viral load handling tweaks