Moar fixes for zip