Fix mac URL parsing.
Merge branch 'bugfixes'