Fix some initial upload conversion problems