Fixed Linux build issues with refactored software.  Need to build and test under Apple.