Workarounds for upload restrictions and some fixes