More Fixes for mac