Linux-specific build fixes
Linux-specific build fixes

grahamsellers/Emerald,grahamsellers/Emerald,kbiElude/Emerald,grahamsellers/Emerald,grahamsellers/Emerald,kbiElude/Emerald,grahamsellers/Emerald,kbiElude/Emerald,kbiElude/Emerald,kbiElude/Emerald