Fixed a couple more having to do with new to_be_uploaded