Cleanup and try to fix zip downloads