small fixes for mac target