Mac support : Few updats to support server execution on MAC

Committed for Jess.