Updates to enable OSX compatibility

Minor tweaks to enable the capture system to work on OSX.  With thanks to Jon Hare.