Make s3store compile with latest code.
Almost compiles with ge.