cleanups and fixes from testing after s3 merge