s3 eng fixes