Prep for no file upload

Also made some uints ints.