bug fixes to s3 manager and resolver