Fixed compile errors when compiling the library, in preparation for a unit test.