Bunch of fixes to ack