More memory saving changes, otherwise can't process control server responses