Updates
Necessary Changes for Mac builds