Fixed build for Linux -- should run on both Linux and OS X now