Fix packaging and date forwarding