Few packet loss system fixes