Fix hardware issue with s3 compile