fixes for macx building issues