s3: misc adjustments in error reporting