Fix Ack & housekeep