Add hacks to deal with large uploads freezing the client