More changes necessary to get building and linking on Linux.