Adjust to work on Mac

These changes work for me on High Sierra. I'd love to hear your feedback to see if you think they're ok - thanks!

Signed-off-by: Andy Goldstein andy.goldstein@gmail.com