Updated Minor Fixes For Mac Platform