Fixed issues in Mac or Windows

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Merge pull request #6291 from jamtur01/mac

Fixed issues in Mac or Windows