Optimize the client a bit to save CPU time