Fixed some timing issues on the client