[UNSTABLE] Fix S3 stuff for local devs