Atem & Rust - #0038:
- [ ] Fix M1 macOS build
- [ ] Minor fixes