Fix starting on MacOS

 Change-Id: Ia9ea70e2aefa50a23f877b0d0e1c5aab280a3222
7 files changed