made small changes to support build on linux.  NOTE: unit tests are not built and need to be fixed
made small changes to support build on linux.  NOTE: unit tests are not built and need to be fixed