Fixes for the first dat uploading files