Fixing Drift estimation and ACK timing