Micro-optimizations
Fixing compilation error on MacOS