Fixed issue with validation and some s3 upload stuff.