Fixes and S3 deployment sketch