Bug fixes around acks and logging