Fixed a few timing and message ordering related bugs by adding extra
ACKs