Minor fixes

A pair of minor fixes.

The Makefile change is necessary to get it to work on OS X.  However, it's not sufficient: OS X doesn't have a python2 command.  There's `python` and `python2.[567]`, but no `python2`.  I've 'fixed' this on my machine by creating a small wrapper on my path.