Fixes for S3 brain saving