Fix for external deps build on OSX and small formatting fixes.